Using the new abstracted storage API. This version works. At least, it loads without errors. Now I need to test if things broke.