Api refactor

• refactoring the hooks, and the Higher Order Components after realizing that it is not possible to background fetch with react query without the hook finishing.