starting over using the Makers Academy method

 Please enter the commit message for your changes. Lines starting
initial commit of MA method
Fixing merge conflicts