Fgnhg matchmode 201911 (#4)

* Add matchmode changes without compilation or tests

* Resolve compilation issues and ensure base fg test is passing

* Add unit tests for matchmode

Author: anish-n