Almost done

One issue, catastrophes and surprises do not redraw upon next turn.
everything else works