Got storage script mostly working. Has some quirks I need to work out