reorganized stuff for multiplayer prototype