Add some code in the server and client side

A work in progress.