Fixed up the handlers to be simpler and only include one copy of the API...

....