Merge vocabulary stuff into main engine class file