Update

Here is what is probably a nearly finished version. I say that knowing that things will pop out at me asking to be changed.