we could. I even thought about it. For now, I just moved the existing logic