Changed to return Response Object and how the object was being populated.
Created more base methods for the response object.