First bits of Lift 3.0
Removed debug code