Scratch Build Update - Getting Closer