About to do significant changes, so saving the work here.