Refactor save method part 1 - beware of failing tests