New data source

Leaving variables - will fix soon