work in progress - clusterController refactoring