Continue work on the cluster code