Moved Numbers out into its own class.