Adding Location, and questions