Pulling in rackerjoe's grizzly work

Addresses issue TA81