work on reminders
merge
work on reminders more