Pushing Greece work - #1 tweaks
Pushing Greece work - #2 data structures

:cat: