small changes
Merge remote-tracking branch 'origin/Sprint4' into Klim
Working on saving function