Added more basic plumbing and search
All conflicts merged. Search updated. Entry data structure updated with field index.