Ws integration

PR for comments
(picky) May not need version.