Right, will try to clean this up a bit.