Some work on autocomplete