Changed some names around, first whack at (untested) Cluster formerly
known as Jeweler. Some other stuff. How's that for a shitty commit?