Refactor to use keys
Add switches for cases deaths and funding
Merge branch 'master' of github.com:UnboxedSchrodingers/hackathon