Hopefully final version of clusterlocations.py