Move scoring into its own system