refactoring
Adding todo to the rest client