Data refactor

cc @Matt-Esch