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?
Add pictures here
<% if( /^image/.test(type) ){ %>
<% } %>
Add image file
Upload is a site by and for consumers of financial services and advice. We are not affiliated with any of the banks, financial services or software manufacturers discussed here. All logos and trade names are the property of their respective owners.

Tax and financial advice you come across on this site is freely given by your peers and professionals on their own time and out of the kindness of their hearts. We can guarantee neither accuracy of such advice nor its applicability for your situation. Simply put, you are fully responsible for the results of using information from this site in real life situations.