[WIP] change to new command format