add save support
wip