Further work on WebclientHandler
Merge errors...