Nearly finished refactoring Args
Finished refactoring Args