(wip): fixes various looping issues and removes combineLatest logic