Added the new handlers to the registry.  And removed some old stuff.