cleaned up a few things, added assignment for class 7