todo notes, oops
Merge remote-tracking branch 'upstream/master'
Friday morning in Denver, making more of a mess