Index rework 1

test test test!