Worked on adding list parameter for disease burden
Fixed merge conflicts and cleaned up the disease burden method a little