Merge "Add saving + rework"