Rearranged creation of args.

It is time ro move away from args completely, this is going to cause issues with functions such as replay.