Nice refactor, about to refactor the rest of the Args stuff