Added location mapping and simple location testing