Patch 7

Again, let me know if I have done anything disastrous. I am learning, I hope.