Resolve the data engine portion of #135

Resolve the data engine portion of #135