On the verge of a major rewrite (and split).