Completed server re-write