Rewrite for health check and supporting functions

Major Health check chages and rewrite.