Made start for #125, not able to test it because of localhosts inability to send mails(?)