Initial work towards typeahead