Refactor so that args are passed on first bundle