Merge branch 'dev-rs' into layout-mh
feed health calculations
wip
Merge branch 'layout' into layout-mh
showing health as an int