Draft: implement better index search

Closes #26 (closed)

Still not debugged, and I'm not sure if the added complexity is worth the better indexing.