Unsure on logic required here, hence the commenting out. I'll need to run it against the remote side to validate this. As mentioned previously, this code has yet to be tested, so will be reworked before release.