Continue work on preprocessor