Add initial work on searching