Gamma implemented, tests remaining
Merging