Fixed: Don't use files; save to blocks