Re-did my Client, Server. Havent tested