Added some server/client stuff