Factory complete. 
Abstracting of Gamma almost done; some methods can't be taken out
because superclass is causing exceptions. Don't know if it's fixable or
not.