Finally got data storage working properly!