Mostly-working redone storage! Now with 50% less hack