start work on full refactoring uskTerminal