Fri Updates

Working on HealthIndicators and data structure