Functionality moved to class.