First working version of client side
Merge origin/master