Add Command; rename old Command to CommandType; command line utility is broken at the moment: my brains stops working