Server Impl finsihed ; Refactor