First commit working server