Minor refactoring.
Draft index query mechanics. (#25)