Server closer to working