First draft of classes module completed