started adding class handlers