Tab Completions.

Had to clean up my branches, resubmitting this one ready to merge against 0.85.0.6