Small changes to code
NEW PREPROCESSOR [WIP]: Less PreProcessor. Currently Buggy.