Rejigged some stuff

Still not as I want it.