Initial scratchings of refactor.  Take health into consideration where provided.
Initial scratchings of refactor.  Take health into consideration where provided.

GoelDeepak/minuteman,GoelDeepak/minuteman