added TODO
refactored server