This working paper constructs a new general equilibrium model of the U.S. economy with highly disaggregated and flexible industry cost and consumer expenditure functions. The new model is able to analyze all the major inefficiencies caused by energy taxation, i.e., those related to production, consumption, resource rents and externalities.