Simplification
very media save redoing
Merge branch 'master' of github.com:billinghamj/crowd-catastrophe
such cleanup