Ugh. It looks like part of your solution and part of my solution ended up in the merge.  (You were using includes, I was using blocks.)  I don't have a strong preference which one we use; any opinion?  @lemanal