Tuesday Afternoon Batch

More changes. I think this is about done.