Iteration 2

Heads up PR for iteration 2.