WIP adding autocomplete