Restructure to include completions