I finished wiring all the buttons last night. I also took a look at the protoboard shield and fixed some of the traces, so the faulty joystick axis and the I2C connectors will work now. I started moving all the controls into the full prototype shoebox which is considerably larger than the current one. I made all the cutouts and mounted most of the controls. I should be able to finish up tonight and have a full working prototype, albeit without ALL of the buttons connected.