Added first draft of autocomplete feature