Adding in game location handling