enough changes to get occurrence to compile against refactored occ api class. tests still broken.