A lot of consolidation. I know enough to do some refactoring now.