Splits out m3rig
Adds argc/argv