Moving back to sourcing files, so that variables are passed