Feature/create client

Remove commented lines before checking in.