working on classes based on Dan's feedback