done with hw7, just gotta clean it up a bit