Qrda Errata 2014

Let's try this again...
At some point we may want to pull the Cat 3 generation code out into a library, for better testing and the like.