When you finish writing these, maybe remove the inline stack comments?

Also, should some of these be private?

Maybe you should wrap them in ``<PRIVATE`` and ``PRIVATE>``...