Moved functions to cli module, working "set" command