More functionality and emails that don't yet work