The functions in this section which don't contain  X509, and aren't in CUSTOMIZATIONS, look like they should be straightforward to put into their own pr?