Major updates to command control