Milestone: Iteration 1 build

Build correct as of first iteration