Check block type
add soft-block beneficiary calcs
Merge pull request #1915 from dimagi/opm_soft_block

Add soft-block beneficiary calcs