Pre-Process #7

Implications #168

Implications #169