Under-construction rewrite done by tomorrow