Adding some new stuff now that the precompiler is changing . . .