Final samples and locations

Pre-measurement info is finalised