refactoring, changing to use more granular endpoints.