More experimentation

Testing out some more concepts on indexing and scoring.  Performance is
pretty so far, but have some edge cases to explore further.