Engine work: Full in-frame and out-of-frame rebuild