Begin re-write on next commit