initil work
more work on client side
Merge branch 'server'