Buttoning up Logic

Added Mail template..
etc