Moved mostly everything to ServerProxy
Removed some comments in Bonanzas