Started breaking up class for better MVC design and started refactoring code into methods.