Descriptor needs to loose weight.
Shifted some code around.
Move all command construction logic from Descriptor to ClientBuilder.