This is mostly consolidation for my own convenience, so don't be surprised if most of it is my own stuff.