Make ws1 stuff OO