Move the TODO into its own file.