Interm commit. WIP for search tryout