more work on the classes