Starting object oriented

Working on making the program more object oriented. Still needs work