Re-working argument parsing, tests still broken.