i wonder whether a holistic solution is worthwhile pre-engine refactor, or whether betting on the engine refactor is still the way to go