Started adding typeahead