A bunch of stuff I never pushed the last time I worked on this.