Move this.
More work on completions
A little more tweaking of completions