One quick revision.

Stilll need to implement email template. That's all.