Develop

Making some changes to the mail class and adding some basic auto loading for optional classes