Initial checkin of the cli tool (not complete)