WIP: change command line interface