Working server TODO Refactoring