More work on converting CLI