Rejigger some of this stuff around a bit