Refactored, added stubs for DataSet, switched to simple consumer and provider