Finished the rewrite!