Adapter fixes and full handler refactor
Merge pull request #22 from danryan/handlers

Adapter fixes and full handler refactor