Refactored to use single index; otehr Lucene refactorings; tests not passing yet