Fixed(?) some route calling weirdness, step 2