obfuscation tech debt

First crack at finalizing the obfuscation API.