Input restructure.  Not much else, but hardcore input restructure!