@jnievelt nice way of thinking about this. I'll try to refactor along these lines when I pick this back up this week.