Almost done with Project07, just need to fix up formatting and check for errors