move into Class