Added the new server code

NEW SERVER CODE
HOPEFULLY WE DON'T FAIL TOMORROW!!!