Refactor methods into classes. Still needs work.