Fixes Issue 30[complete] and Fixes Issue 11[WIP] - locked clients, client-to-server server-side testing

When you rebase you'll see that this has been fixed on master, it should be 404.