+ Client, + command refactoring project