Move controls to macros
OrderedDict for switches
Git ignore .pyc