Initial commit on the WS implementation