Making an irregular footprint work while maintaining the ad-hoc charm of the original structure and making sustainable upgrades. More