Moved to a class.