Added save/load support, complete multi-zone implelemtation