Cleaned up classes. Now more OO. There is an end now