So last night my new shafts showed up, was a little worried at first since the box was a little mangled on one end, but nothing was missing.
Got home and pulled the driver side, no issues and went back in easily other than getting oil all over. Also figured out the passenger side using a 1/2"...