As long as we keep this class together and add