Step 1 - 3, 5 upload

Initial commit of step 1-3, 5