Event 46

@ryancarlson review please 
I'm going commit by commit.  You fixed it in a later commit, to which I
gave a :+1: