Trecouvr/ws addressing

Depends on #22