Almost working

Only client side is left