Change api a bit and have a working client server sending stuff