Search functions 99%, revision master well underway