Some planning and fiddling