A bit more preparatory work.