Starting to convert to an object oriented design.