Server refactor - *NONWORKING, UNDER CONSTRUCTION*