Prepping for version 3.