Upgrade of Architect. Also beginning to separete Ext/Touch logic.
Normalizing some logic across Ext and Touch
More Ext/Touch normalization