That's the long term plan, once the new command line stabilizes.