Updated file after getting my classes broken out