First - WIP - version.  Partial preprocessor, nothing more.