mostly done with milestone one, ha