Added some broken work on GRA merging