First functional version of new cluster logic.