Now passes currentLoc into BattleEngine