Cleaned up and mostly done.

So far, cleaned up - and I’m mostly happy with it.  There’s a couple
little things that I still need to finish up.