So I realized that I really only needed 12 keys for the matrix (4 for the joystick, 2 for l/r bumpers and 6 for the buttons) so I changed it into a 2x3 matrix so I wouldn’t be wasting a pin. I also completed the left bumper and all 4 keys for the joystick, so all that’s left for the schematic is adding the LEDs/OLED. I might go back and change up how the joystick/bumpers are wired to the matrix board so I have less wires to solder, but it’s fine for now.