Making the entire engine more unit testable.