Added proper client support I think. Updating so the server can get what I've got.