- Changed server implementation to something more sane/class-based