WIP: Webservice Endpoints #2

Draft
tux wants to merge 4 commits from ws_endpoints into master

4 commits