commit 3
still testing
client initial structure
some 'meta'
Merge remote-tracking branch 'origin/master'