Fixed all issues with current refactor.
Started on the refactor to make general the rest calls.