Step 2 finished

Ready for QA