Moved to their own class.