API refactor for dashboard changes
Rethinking how stuff is working
Merge branch 'api_refactor'