Merge pull request #2552 from reaperhulk/crlnumber

CRLNumber needs to be a class for reasons