Some more awesome programming stuff

made index tests green