Beginnings of autocomplete
Fixing merge conflicts