Starting to rebuild control flow with circles