Controls table init
Merge pull request #756 from ahomatthew/develop

Controls table init