Fix many cluster

This is a preview for all you lovely people. It's on top of josh's review.