Various changes to pave the path to multiplayer