Wait are we even using this class anymore?