You have the input on the lines you set forth in your post in the correct amounts based on your figures.
The more difficult part is, however, handling depreciation after the exchange.
