Semi-Major Update

Hit a roadblock, quitting for tonight.