Feature/gzi/server