engine refactor is way, way up there