Refactoring to support better freezing/defrosting behaviour down the track.