You would be better served to engage a local tax professional for this matter.
See https://taxexperts.naea.org/listing/service/individual-tax-preparation
Regardless, note that the 1031 exchange requirements still apply in the sense that all improvements must be constructed within the 180-day time period.
