Fixing up classes. Close to a 1.0