first server implentation
merge