some more helpful stuff
porting to new clustering system
Merge branch 'new_cluster'