Added some things for search, not quite done yet.