Step 1 finished
Merge branch 'step1'

Merged step 1 of the MVP