Issue 18: Case Management 152