Preliminary commit, working on the mail transport class and the datasource