Changed argument parser to use CSV (kinda)