Better command line control of clustering.
Getting initial clustering working.
Getting initial clustering working.