Prepping for 2.0