Refactor for new infrastructure. Need to find a better way to display commands.