Have started keeping my eyes open for a used engine for my 89 YJ.  Wondering if there is any difference between a CJ engine (could I switch over my new clutch fan, alternator, water pump, timing set....)?  Could I use a 4.0L from an XJ and put my intake and new carb on it.  Not in a big panic right now, but before may long have 'er dun!!!