Fixed or Current Asset?

I played around with a copy of my company file and changed my property from
Inventory to Other Current Asset and that is getting rid of my COGS issue.
This is a property acquired for rental, but capital improvements to prepare
it for the rental market. My question is should I use current asset and
then move to the Fixed Asset Manager when the property is available for
rent or should I place it directly into a fixed asset account?