Merge some old stuff I had laying around

2017-03-10, Gary Kramlich