Progress1Revision1!

Changed everything to be exactly the way it should be