option a/b implemented. Includes updated locations.zip test data