Argument system improvements
Started constructing templates for commands