Complete Version of endpoints (untested)
Merge branch 'master' of https://github.com/flexyford/rsp-resurrected