Its so slow now. Need to investigate why. On plus side, code refactor is essentially complete. Now all OO structure (or at least a lot better). Preprocessor yet to be done done. Also figured out one step in the preprocessing was causing MASSIVE ringing at beginning of some templates, its insane.