Autocomplete wait

This should unblock the autocompletion work.

It's a bit hacky, but I guess it shows the way forward.