Add an acceptance test around everything so I can refactor with a bit more confidence. Scribbled a few ideas down too.