Added some classes, updated definitions

Lots to do still