working on enc/dec codebase now