Added proper TODOs in BattleField to aid in implementing server commits