Add env settings setup + swap arg order passed in