Prep work for further additions