yet more autocomplete WIP