Prep for OOP wet work :mushroom::mushroom: