Did a few changes to the classes so we can start working separately