included a few HEALTH command layout items. Merge all this and then start new feature branch