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

Also, add a comment above to indicate what this is, and why we're doing it at all, how we'll use the info, etc.