Mostly done with 1st draft, saving out of caution