part way through a huge rewire, crossing fingers

Change-Id: I007e70c11ec572af185d1b4265ad03691761c817