Fs pp

Re-do of FS Preprocessor pull request.
Cleaned up the log history so it only has the 2 commit messages that are relevant for this pull request.  Throw out the first pull request.