This proposal re-structures the N fertilizer sector in the model, replacing the trade structure which was implemented before GCAM had the capability to trade secondary goods between regions, and re-naming the production commodity "ammonia" in order to better set up the model for representing ammonia as an energy carrier in subsequent work. Several bugfixes for GCAM 7.0 are also included in the proposal.