The 1.7 rewrite begins!