completely factored GRIFFIN
Merge pull request #1 from BillMills/master

completely factored GRIFFIN