[Porsche-O-Phile]

Bringing it into compliance now could open up other cans of worms - energy codes have gotten much more stringent in some places in the last few years. Are you sure that they'll not require you to bring all that "new" habitable space into compliance with the current codes or will they grandfather you in under the codes adopted at the time of construction?

Could get very expensive.