Finished moving existing commands over to new ui format.