Pulled move into its own class, and extracted a method from it.