Feature/indexing enhancements

Here you go!

Now it's time for me to put all these new features to use!