Added a command-line tool and pairing