#92 consolidates these, but some repetition is OK. Let's see if we can use includes or document parts so we don't duplicate the source!