start refactoring tirpan to fix remaining problems