Did a bunch of server side re-arranging