Milestone 4 and 5

Milestone 4 and 5 complete. Starting milestone 6.