Revisiona and added TODO's to WS2