Added to todo items for core.  Revamped search functions and what is actually returned from searching (a keyring rather than separate keys.