I like to do as much straightness training as I can on the ground first, and then start the same progression under saddle.