Commit up to Milestone 1 build