Partially implement new clustering mechanism