Code refactor, can now add reminders