Nog3/newindex

This is my take on nog3's pull request, for everyones interest.