Willing to work on CMD - implement more robust parser