much more expansion done, include files, etc