wip commander

@rickmendes take a look