Todo: command line integration