Can this be defered to a follow-up pass? This will cause a lot of code churn at this late stage of the game...