Some updated server stuff - still doesn't work!