shoved some parts around, lots more routing work