Major overall haul in code to follow MVC method.