Cleanup logic

Work we did in the office to sort out the dispatcher logic