Bromeliad: Preparatory patch for Multiplayer Update

This is a simple preparatory patch for the multiplayer update, setting things up for the upcoming MP integration.