Ali, what do you think about 
https://github.com/mozilla/webmaker.org/pull/257#pullrequestreviewcomment-5355939