Autocomplete done, will try to simplfy things