Feature/gzi/server

jup