-planning and class design, removing some debug messages