no :(

ANd yeah, I'm not a fan of this either.   I have a TODO to clean it up in the next PR.  Mind waiting until then?  The new structure let me clean it up in a  far easier manner.