Milestone 1 changes

Oh god oh god this code is awful. Wiping this repository tomorrow >////<