begun refactoring orca