Committing some things for reference because this clustering is good, but
modifications to the evaluation branch broke something. I need to be sure that
the clustering I use for evaluation is correct but I don't want to muck up the
master branch at the moment