start slimming down the view and model classes