Thank you for your reply.  On the JE, I just didn't show the removal of the old as removing it and adding the tradi in value back to the new ended up with the same balance in the asset account.

Thanks for the heads up on basis, I'll look into that