Seperating client from server, fix #5