Bit of a refactor problem, solved now.