I like the current classes. They just need a bit of refinement.