Milestone 3

More code