Cluster Management

Added and shuffled a bunch of stuff