Refactoring.
Simplify the creation of units, and the work of the Dispatcher.