Started work on search 2.0