Bhard/data sources

Fixes #149 and #85