Intermediate commit before bigger rewrite. (Since we are still in early development no branching.)