feature/client

Solves #14