can we stick this class into its own file?