Added autocompletion...we will see how this pans out