Overhaul of the Dispatcher, speeding up, fixing bugs, and improveing readability.