Added locationing class