first pass at grizzly support

Change-Id: I183a0ea9addeb7097e73ccce0051cbe603c47cd3