reworks methodology to close #1649 and close #1064
closes #1723
closes #1787
Merge pull request #1806 from OCHA-DAP/marianne-dev

reworks methodology to close #1649 and close #1064