WIP: Webservice Endpoints #2

Open
tux wants to merge 4 commits from ws_endpoints into master