Seperate client and server
seperate, continued