Feature/better server