Two years have passed since Marty and Jimmy went up against an unstoppable force and came out badly wounded on the other side