Initial commit, just after step 3
Removed commented code