Finished with the initial rewrite of the autocomplete