Done refactoring to support new update mechanism.
Add underscore to client.  Rename Und to _.