Both command types now working.