Begin work on a branch that will make grok optional