Done some more work on multiplayer