Finish up the last bit of changes from Ethan's clustering rework
still needs to be tested