WIP including new deficit calc.