fixed hw4, finished up class 7