continued work on adding classes