Moving functions around to the proper class.