Gr3.7

Edits required to build in GR 3.7.x API
However, I recommend maintaining a separate branch for 3.6.x API as this will not build for people still using <3.7.