Work in progress - updates to sample location fields