A lot more progress on the dispatcher