Server side now works fully.
(Client side works somewhat flakily)