Move unload code to unload method
High level code structure for Project 3