a lot of changes, data storage working, please pull