Switched over to object oriented design. Plenty of functionatlity still needs to be moved.