Completed Client Hopefully
Sever - minor ammendment