Updated to latest API.
Refactoring.
Added reminders