Asynchronous rewrite, better testing