Context diag hunter

Hunter told me to merge these for him. Doing so right now.