lots of updates. InsertClass and new routes