Edit editorial metadata on calendar

I was having some trouble wrangling in the commit history on the last pull request, so I wanted to make a fresh start on this one and try again. I think I've got everything working..? I've tried rebasing it and it seems to have worked, so hopefully this will work a bit better.