Sounds like you have a handle on it now. I'll happy dance with you!