Patching up the client side/server side update function, not complete
Moved logging to the server, added some new logging