More work on orgclasses