Name indexing

Attemping pull request.

See if this works