Address Completion Control

Leverages the previous pull requests.