Reworking cluster management. Work in progress.