work in progress, new templates for email, bug fixes, new migrations, some refactoring, added new use cases