Added new version of client code plus some placeholders.