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

When is this going to happen, another bug after this lands (I'm fine with that, but let's not lose track).