working on a fix to emails not being sent out properly. Pushing now so that I can rebase and get stuff from the main branch