Dispatch to minimalist handlers now working
A probably failed attempt to hide the god object