ya that sounds right based on our irc conversation from yesterday, we'll have to support the two code paths, the legacy and new one.