Just about to add search capability. This commit is a savepoint in case something goes terribly wrong