Working on autocomplete

Doing some progress in the autocomplete