Commit before big rewrite