More work on getting rid of classes