Move into class