v.0.1.1: Partial rewrite.