Moving more commands to new system...