potentially... i'd like to hold out a bit longer, because i think it might be a challenge to backport. if i have time to work on this week, want to