Save is mostly working