Feature/first draft of client