95% of the way through a rebase of the engine patch to master... will finish that tomorrow and then start working on TODOs from the review