Still need to fix the server/client