Grizzly update

these are the current changes from my repo rebase off of the current state of grizzly. The rebase really cleaned things up!