moving data logic over to new infrastructure, fingers crossed!