Removed most of old classes system, began move to using only models for database interaction