I'd like to be getting emails on errors, however I'm not such a big fan of commented code - can we pull into another pul request?