deleted the old class. merging names soon