move towards actions rather than if/else menu mess, feel out the change viewer/merge component
more work on change viewer/merge tool