Prepping for some changes.