Overhaul health and disability system

Continue the work to overhaul the health and disability system.