CommonProxy Way, need ClientProxy to work and main edit

Not done
Part 2/3 Of Server Fix
Part 3/3 of Server Fix
Merge pull request #2 from wasliebob/master

Pull Request Server Fix