working on server part
merge :)