Finished 6 and 7

Still need to do 5, and include higher order functions for 7