Conditional KIF

Found out in my original pull request I had cloned my fork instead of the MM fork before I started my work. This made rebasing the pull request much harder. I followed some instructions I found online and created this branch and am making a new pull request to try things the right way this time around.