Broke up classes and added basic stuff