Proposed Accounting for Revenue and Non-exchange Expenses