This func is just moved down to the bottom of the file, since it seems to be akin to "setup" and I wanted to group the functions.  However this made the diff a little noisy.  Apologies.