more work on the new data layer