Moar Clusters

I added clusters into the server loop. May be other changes if you want to cherry-pick