Added consequence editing
Reorganized totals to be calculated