hw 5 is as done as it is going to be. but i need to merge maddy's stuff