Save is now fully functioning