Simple completion

WIP PR to the new context-completion branch