Adding back all of the stuff that I erased.