Finished the reset of the major rewrite