merged server - still working on client