Catkinizing (hybrid), and adding experimental xdot support import