New class datasource. Still error in code!