Added a bunch of stuff for On and a general Putting it all together section