Commands: Refactor encoding command
Commands: Take CommandId as a parameter

Slight simpliciation

Also change ZenCoding to not use magic numbers