Add cli and command handling