bit of a tidy - I must find a better way to do some of this stuff