Redo of SS Mockup, moving files around, adding EEF