Almost solitified the data api, just a bit further to go. This is a
broken commit.
Getting closer to a more unified data api
So close, yet so far away
A different take on this here project...