Finished the rewrite, let's test!