Further work on that auto complete.