Mass move stuff
Make index slightly less ugly