Double Strength Affine
A slight security upgrade, is it enough?
For anyone that was as confused as I was, you're going to be applying the Affine transfer/cipher TWICE. Once for the modulus 29, and a second time for the entire (2 character) block value with modulus 841.