Rework the way engines are built