Rework API to hook into our existing views
Merge pull request #1 from ahinz/topic/api-upgrade

Rework API to hook into our existing views