Minor refactor, added palceholders fori TODOs in apiUrls