starting to fix the classes