Some of this stuff could probably be final- I'm a bit final-happy, but it's worth thinking about.