Complete restructure of the engine for D-specific features, about 80% complete