Fixed up the handlers to be simpler and only include one copy of the API.
Merge pull request #3 from ajorians/WorkWithHandlers

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