move into class