Merging in reminders

Merging reminders functionality from the temporary branch.