Begin adding architecture for api calls