Reworking to work with any class.