oops, that duplicates data in Location; drop the Sitename too; rethinking this. #3