Prepping for multiplayersupport