Progress on tier2 mustache for risk_assessments