reverted server to todo base