Limit it to primary residence. Tally the tax deferred and take it out when the property is sold or transferred. Remove it from commercial properties.