Updated goal title.
Pulled out data source into its own class.