Add WIP
Merge branch 'master' into email-updates
Added everything that's necessary - it needs some serious tweaking on MailChimp's side, though.