start refactor of liftover