breaking up scenarios. minor refactor in the api class