Yep, that's the plan. I learned from my mistakes on the first go around. I'm going through both axles and rebuilding them. I'm doing some extensive frame and tub work while the old drivetrain is out since I have more room as well. More pics to come....