Yea, that is probably a better solution. Not an easy one to refactor into at the moment though.