ws working - not yet quite good