Taxpayer moved back into the property in 2017 and it is their primary residence now.  They plan to live in the property as a primary residence until sale in 2020-2021 time frame.

Do I enter everything and carry forward the expense as a PAL until the sale frees it up?