Control

Merging control additions with beta branch.

Thanks Pawan for getting up to speed on this!