Added server
finished server