Add typeahead functionality
merge conflicts