organized, changed up the parsing args