last commit before moving to modules

broke everything out to classes. will change to modules