Pairing: john 'dig' diggle/oliver queen