Adding initial CLI implementation