I refactored on a Saturday, that makes me feel a bit dirty. But it has to be done, and now I've worked out a better dialogue system, so it's all good. Also did some Blender practise, and watched Con Air, so all in all an acceptable day.