Yep, I figured this is where you'd go with this. So if I converted everything to functions, I'd get just the behavior I want?