New reminders

Merge in the feature branch 'new-reminders'