Updates to make multiplayer work
Updated to reflect Dan's changes, preserved multiplayer updates