Started the process of refactoring, still a lot of work to do.