WIP: command line tools