As mroe I know about the engine as more refactoring I'd do