butt ugly new facets
sort of closes #1205
changed something I shouldn't have
Merge pull request #1232 from OCHA-DAP/marianne-sprint

Marianne sprint