Moves some code around in the local client, and fixes some blocking issues in the renderer code, which still needs a bit of cleanup