Initial pass at refactoring overdue code and exposing a new public OverdueApi