indentation
Added persistance should-have, limited CLI e-mail