First steps toward a rewrite.