More Prep Changes

almost ready to start