I'm having kind of a rough week, so I didn't get much coding done today. Let's try moving around a type and see if I break everything.
Hm, everything broke, time for plan B. Plan B worked fine, at least for now.
Several rounds of tinkering later, I realize that it's way late and I need to get to bed, but I really want to break out a few more modules. Time for some bad decisions.