started reorganizing into classes