I have recently started my first project ever. It is an 83 CJ5. The 258 engine is in pieces but the block and head seem fine and all parts like starter, alternator, carb etc, is there. I have a chance to purchase a recently rebuilt 258 engine from a 84 CJ5. Will it fit?