More functions incorporated into argmap.