Switched to pin change interrupts and made all  channels come through using PinChangeInt library