Updated client and added barebones server