Initial commit of refactor from SMSOverEmail