Shifting things around, preparing for the real pinout & layout.