Restored lifting, reordering, and small stuff.
Restored core and its tests.