Giant 2nd Pass

I went back and started over from the beginning. I really hated that last version so I took a hit on my time to start doing something I like. I hope it turns out to have been a good move.