Some clusterless working, need to debug numbers