rename fn
factor out var
start to sort out formatting for last year's stuff
remove apparently unused condition
plumb new formatting data through to simplified template
fix indicator reference
add note re possible error
straighten out a bit more of the last year logic
pass through more helper vars