Fix the client/server interaction

Next step: some fun with the pull/push logics