Using the Handler for the REST api on both sides of the connection

Things are actually in a broken state here because we've
got a conflict between how the two sides do their work
and some extraction needs to get done. This commit
is just a stopping-point so I can do the necessary
refactoring.

Signed-off-by: Luke Kanies <luke@madstop.com>