server organisation
added save support