Updated server things, still under development...