Iteration 1

Refactoring for iteration 1