Track commands in their own functions