Did some work on keySearch, will do more tomorrow