More finalized milestone 1 code