you're right here, the control flow on this needs some work