Added more functionality to other classes, one of my tests still needs to pass.