Dev

merge the end of step 3 of turotial into master