Simplify the dumb stuff I did
That should be a pointer
Merge pull request #4 from schmichael/chaff-refactor

Simplify some stuff