Eventually we should redo this with the menu system somehow.