Stubbed out API calls added TODOs