Progress toward autocompletion for #16