Finished new argument parsing system