Picked up a 96 XJ 2wd 4.0 last week. Need to do a motor swap. I have a Motor from a 95 YJ what will I need to do besides a different water pump and move the fan.

I know I will need to take the clutch off the 95 and put the torque on the 95 motor,