Server fix

So...... there's a lot of new shit.

Enjoy.