Much better lists.
Merge branch 'master' of github.com:michalgm/state_dem
Some merging.