initial merging of encoder/decoder
combined encoder/decoder
Merge pull request #2 from hillmandj/classRefactor

Class refactor