You can convert the property to personal use to stop depreciation and then add.
I'm going to page @AmeliesUncle for input on the ADU, et al.. Please check back.
