edited datasource so we can persit objects in db for testing
Cleaned it yet again lol