Add back functionality
Merge branch 'module-reminders'