Development

I'm not done testing this, as our staging server has some issues with events right now. I'd like to do more testing before this is merged, but I'll keep this open for discussion until then.