HI Again!
I just added the cost of building out the second/expansion unit into TurboTax exactly as you suggeted in your post and it gave me the options of spreading the deduction over 39 years, taking the entire deduction this year (2018) or taking a partial 179 deduction.
Thanks for any advise you can offer,
Charles
