Work in progress on save all