storing shitttt
merge conflict; inital saving of storage data; to test, should delete some code