Rework API to hook into our existing views