First stab at supporting locations