I've bust it..
Fixed, returned datastore intermediary for data storage