Prepping for frontend changes