Some work on completion for the editor