Incremental changes

Working on the preprocessor.  Doesn't compile now.