work on save functionality started