Work in progress, adding mailing functionality