diff --git a/README.md b/README.md
index 062e549..b1fc940 100644
--- a/README.md
+++ b/README.md
@@ -1,63 +1,25 @@
-# Lit + Zustand Architecture
+# zulip
 
-A simple (but modern & scalable) no-build web application architecture using Lit web components with Zustand state management and IndexedDB persistence.
-
-## For TSX/React Developers
-
-If you're coming from React/TSX, here's how this architecture maps to familiar concepts:
-
-| React/TSX Pattern | This Architecture |
-|-------------------|-------------------|
-| `useState` / `useReducer` | Zustand vanilla store |
-| `useEffect` + state subscription | `StoreController` (ReactiveController) |
-| Context API | Global Zustand store |
-| `localStorage` / `sessionStorage` | IndexedDB via persist middleware |
-| JSX | Lit's `html` tagged template literals |
-| CSS-in-JS / CSS Modules | Lit's `css` tagged template literals |
-| React Router | Simple route state in store |
-| Build step (Vite/Webpack) | Import maps (no build!) |
-
-### Key Differences
-
-1. **No Virtual DOM**: Lit uses native Web Components with efficient DOM updates
-2. **No Build Step**: Import maps let you use npm packages directly from CDN
-3. **Reactive Controllers**: Replace hooks - attach to component lifecycle
-4. **Tagged Templates**: Instead of JSX, use `html\`<div>...</div>\``
+A modern, no-build web application using Lit web components with Zustand state management.
 
 ## Architecture Overview
 
 * **Lit-based web components** - Standards-based, framework-agnostic UI
 * **No-build tooling** - Import maps only, no bundler required
 * **Zustand state management** - Lightweight, vanilla JS store
-* **IndexedDB persistence** - Automatic state persistence with idb-keyval
+* **StoreController** - Reactive controller that bridges Zustand and Lit
 
-
-## Layout
+## Project Structure
 
 ```
-src/
-  store/
-    index.js          ← zustand store definition
-    middleware/
-      persistence.js  ← idb-keyval persist adapter
-      sync.js         ← optional cross-tab broadcast
-  components/
-    app-root.js
-    feature-a/
-      feature-a.js    ← Lit component
-      feature-a.css   ← adopted stylesheet or constructable
-  controllers/
-    fetch.js          ← ReactiveController for API calls
-    3d.js             ← optional Three/WebGPU controller
-  lib/
-    idb.js            ← thin idb-keyval wrapper/schema
-index.html
-importmap.json        ← extracted importmap (referenced via <script src>)
+components/ -> standard lit components, including top-level "app-root"
+controllers/ -> lit reactive controllers (such as Zustand<->Lit bridge)
+store/ -> defines specific accessor sets
+index.html -> entry point with inline importmap and app-root
+README.md
 ```
 
-## Data Flow Diagrams
-
-### Component-to-Store Pattern
+## Data Flow Diagram
 
 ```mermaid
 sequenceDiagram
@@ -65,116 +27,86 @@ sequenceDiagram
     participant LitComponent
     participant StoreController
     participant ZustandStore
-    participant IndexedDB
 
     User->>LitComponent: Click button
     LitComponent->>ZustandStore: Call action (e.g., addItem)
     ZustandStore->>ZustandStore: Update state
-    ZustandStore->>IndexedDB: Persist (via middleware)
     ZustandStore->>StoreController: Notify subscribers
     StoreController->>LitComponent: requestUpdate()
     LitComponent->>LitComponent: Re-render
     LitComponent->>User: Show updated UI
 ```
 
-### Store Subscription Pattern
+## Example
 
-```mermaid
-graph TD
-    A[Zustand Store] -->|subscribe| B[StoreController]
-    B -->|selector function| C[Extract specific state]
-    C -->|value changed?| D{Compare}
-    D -->|Yes| E[host.requestUpdate]
-    D -->|No| F[Skip update]
-    E --> G[Lit re-renders component]
-    
-    style A fill:#f9f,stroke:#333,stroke-width:2px
-    style B fill:#bbf,stroke:#333,stroke-width:2px
-    style G fill:#bfb,stroke:#333,stroke-width:2px
-```
-
-### Complete Mental Model
-
-```
-┌─────────────────────────────────────────┐
-│           User Interaction              │
-└──────────────┬──────────────────────────┘
-               │ (events)
-               ▼
-┌─────────────────────────────────────────┐
-│        Lit Web Components               │
-│  - html`` templates (like JSX)          │
-│  - css`` styles (scoped)                │
-│  - Event handlers                       │
-└──────────────┬──────────────────────────┘
-               │ (actions)
-               ▼
-┌─────────────────────────────────────────┐
-│      StoreController (glue layer)       │
-│  - ReactiveController interface         │
-│  - Subscribes to store                  │
-│  - Triggers requestUpdate()             │
-└──────────────┬──────────────────────────┘
-               │ (selector)
-               ▼
-┌─────────────────────────────────────────┐
-│       Zustand Vanilla Store             │
-│  - Global state (like Context)          │
-│  - Actions (like reducers)              │
-│  - Subscriptions                        │
-└──────────────┬──────────────────────────┘
-               │ (persist middleware)
-               ▼
-┌─────────────────────────────────────────┐
-│  IndexedDB (via idb-keyval)             │
-│  - Automatic persistence                │
-│  - Async storage                        │
-└─────────────────────────────────────────┘
-```
-
-## Quick Start Example
-
-### 1. Define Store (like Redux/Zustand)
+### 1. Define Store (Zustand Vanilla)
 
 ```javascript
 // store/index.js
 import { createStore } from 'zustand/vanilla'
-import { persist } from 'zustand/middleware'
 
-export const store = createStore(
-  persist(
-    (set) => ({
-      count: 0,
-      increment: () => set(s => ({ count: s.count + 1 })),
-    }),
-    { name: 'my-store' }
-  )
-)
+export const store = createStore((set, get) => ({
+  count: 0,
+  increment: () => set(s => ({ count: s.count + 1 })),
+  decrement: () => set(s => ({ count: s.count - 1 })),
+}))
 ```
 
-### 2. Create Component (like React component)
+### 2. Create StoreController (Bridge)
+
+```javascript
+// controllers/store.js
+export class StoreController {
+  constructor(host, store, selector) {
+    this.host = host
+    this.store = store
+    this.selector = selector
+    host.addController(this)
+  }
+
+  hostConnected() {
+    this._unsub = this.store.subscribe((state) => {
+      const next = this.selector(state)
+      if (next !== this.value) {
+        this.value = next
+        this.host.requestUpdate()
+      }
+    })
+    this.value = this.selector(this.store.getState())
+  }
+
+  hostDisconnected() {
+    this._unsub?.()
+  }
+}
+```
+
+### 3. Create Component (Lit + StoreController)
 
 ```javascript
 // components/counter.js
 import { LitElement, html, css } from 'lit'
-import { StoreController } from '../controllers/store.js'
-import { store } from '../store/index.js'
 
 class Counter extends LitElement {
-  // Subscribe to store (like useSelector)
-  #count = new StoreController(this, store, s => s.count)
+  static properties = {
+    count: { type: Number, state: true }
+  }
+
+  constructor() {
+    super()
+    this.count = 0
+  }
 
   static styles = css`
-    button { padding: 1rem; font-size: 1.2rem; }
+    button { padding: 1rem; font-size: 1.2rem; margin: 0.5rem; }
   `
 
   render() {
     return html`
       <div>
         <p>Count: ${this.#count.value}</p>
-        <button @click=${() => store.getState().increment()}>
-          Increment
-        </button>
+        <button @click=${() => store.getState().decrement()}>-</button>
+        <button @click=${() => store.getState().increment()}>+</button>
       </div>
     `
   }
@@ -183,40 +115,32 @@ class Counter extends LitElement {
 customElements.define('my-counter', Counter)
 ```
 
-### 3. Use in HTML (no build step!)
+### 4. Instantiate in parent (such as app-root)
 
-```html
-<!DOCTYPE html>
-<html>
-<head>
-  <script type="importmap">
-  {
-    "imports": {
-      "lit": "https://esm.sh/lit@3",
-      "zustand/vanilla": "https://esm.sh/zustand@5/vanilla",
-      "zustand/middleware": "https://esm.sh/zustand@5/middleware"
-    }
+```js
+import counter from "./counter.js":
+
+class AppRoot extends LitElement {
+  render() {
+    return html`
+      <counter></counter>
+    `;
   }
-  </script>
-</head>
-<body>
-  <script type="module" src="components/counter.js"></script>
-  <my-counter></my-counter>
-</body>
-</html>
+}
 ```
 
-## Benefits Over React/TSX
+## Benefits Over TSX
 
-✅ **No build step** - Edit and refresh, instant feedback  
-✅ **Smaller bundle** - No framework runtime, just standards  
-✅ **Better encapsulation** - Shadow DOM, scoped styles  
-✅ **Framework agnostic** - Works anywhere, even in React apps  
-✅ **Future-proof** - Built on web standards  
+1. **No build step** - Edit and refresh, instant feedback  
 
-## See Also
+1. **Smaller bundle** - No framework runtime, just standards  
 
-- [tasks.md](./tasks.md) - Current issues and improvements
-- [Lit Documentation](https://lit.dev)
-- [Zustand Documentation](https://zustand.docs.pmnd.rs)
-- [Web Components](https://developer.mozilla.org/en-US/docs/Web/Web_Components)
+1. **Better encapsulation** - Shadow DOM, scoped styles  
+
+1. **Framework agnostic** - Works anywhere, even in React apps  
+
+1. **Future-proof** - Built on web standards  
+
+1. **Familiar patterns** - Zustand works like Redux/Context  
+
+1. **Type-safe** - Can add JSDoc or TypeScript without build step
diff --git a/TASKS.md b/TASKS.md
new file mode 100644
index 0000000..7a232fe
--- /dev/null
+++ b/TASKS.md
@@ -0,0 +1,66 @@
+# Tasks & Issues
+
+## 1. Critical Issues
+
+- [x] **1.1 Fix missing `del` import in store/index.js** ✅ COMPLETE
+  - Line 3 now imports `get, set, del` from idb-keyval
+  - Used in removeItem function on line 13
+  - No more ReferenceError
+
+- [x] **1.2 Fix hydration flag initialization** ✅ COMPLETE
+  - Implemented Option A: Initialize `_hydrated: true` by default
+  - Removed problematic `onRehydrateStorage` callback
+  - App now loads immediately without hanging on "loading..."
+  - Persistence happens in background automatically
+
+- [x] **1.3 Consolidate duplicate storage implementation** ✅ COMPLETE
+  - Single storage implementation in `store/index.js`
+  - Uses idb-keyval directly with createJSONStorage
+  - Clean, simple approach without extra middleware files
+
+## 2. Architectural Improvements
+
+- [x] **2.1 Add error handling** ✅ COMPLETE
+  - Added try/catch blocks around all IndexedDB operations (getItem, setItem, removeItem)
+  - Implemented fallback: returns null on getItem error, silently fails on setItem/removeItem
+  - Added error state to store with auto-clear after 3 seconds
+  - Added validation in addItem and removeItem actions
+  - Created error-toast component with slide-in animation
+  - Toast shows error messages and allows manual dismissal
+
+- [x] **2.2 Add partialize option to persist middleware** ✅ COMPLETE
+  - Added partialize to exclude `_hydrated` flag from persistence
+  - Only persists: user, items, and route
+  - Prevents unnecessary data in IndexedDB
+
+- [ ] **2.3 Add basic CSS reset to index.html**
+  - No base styles, margins, or font settings currently
+  - Consider adding minimal reset or normalize.css
+
+- [ ] **2.4 Add loading states for async operations**
+  - No loading indicators for add/remove item operations
+  - Consider adding optimistic updates
+
+## 3. Nice to Have
+
+- [ ] **3.1 Add TypeScript types** (optional)
+  - JSDoc comments for better IDE support
+  - Or migrate to .ts files with no-build setup
+
+- [ ] **3.2 Add cross-tab synchronization**
+  - README mentions optional `sync.js` middleware
+  - Implement BroadcastChannel for cross-tab state sync
+
+- [ ] **3.3 Add route history management**
+  - Integrate with browser history API
+  - Support back/forward navigation
+
+- [ ] **3.4 Add unit tests**
+  - Test store actions and selectors
+  - Test component rendering
+  - Test persistence layer
+
+- [ ] **3.5 Add Storybook support**
+  - Introduces parallel build (vite internally) but core app remains no-build
+  - Storybook includes raw/native web component support
+  - Ensure individual components and layouts are properly organized, documented, demonstrated, and tested
diff --git a/components/app-root.js b/components/app-root.js
index 6fe53e9..29454ec 100644
--- a/components/app-root.js
+++ b/components/app-root.js
@@ -1,9 +1,10 @@
 import { LitElement, html, css } from "lit";
 import { store} from "../store/index.js";
-import { StoreController } from "../controllers/store.js";
+import { StoreController } from "../controllers/store-controller.js";
 import "./nav-bar.js";
 import "./page-home.js";
 import "./page-items.js";
+import "./error-toast.js";
 
 class AppRoot extends LitElement {
     #hydrated = new StoreController(this, store, s => s._hydrated);
@@ -31,6 +32,7 @@ class AppRoot extends LitElement {
         return html`
             <nav-bar .user=${this.#user.value}></nav-bar>
             <main>${this.#renderRoute()}</main>
+            <error-toast></error-toast>
         `;
     }
 
diff --git a/components/error-toast.js b/components/error-toast.js
new file mode 100644
index 0000000..0e90eda
--- /dev/null
+++ b/components/error-toast.js
@@ -0,0 +1,79 @@
+// components/error-toast.js
+import { LitElement, html, css } from 'lit'
+import { store } from '../store/index.js'
+import { StoreController } from '../controllers/store-controller.js'
+
+class ErrorToast extends LitElement {
+  #error = new StoreController(this, store, s => s.error)
+
+  static styles = css`
+    :host {
+      position: fixed;
+      top: 1rem;
+      right: 1rem;
+      z-index: 1000;
+    }
+
+    .toast {
+      background: #ef4444;
+      color: white;
+      padding: 1rem 1.5rem;
+      border-radius: 8px;
+      box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      min-width: 300px;
+      animation: slideIn 0.3s ease-out;
+    }
+
+    @keyframes slideIn {
+      from {
+        transform: translateX(400px);
+        opacity: 0;
+      }
+      to {
+        transform: translateX(0);
+        opacity: 1;
+      }
+    }
+
+    .message {
+      flex: 1;
+      font-size: 0.9rem;
+    }
+
+    .close {
+      background: none;
+      border: none;
+      color: white;
+      cursor: pointer;
+      font-size: 1.2rem;
+      padding: 0;
+      opacity: 0.8;
+    }
+
+    .close:hover {
+      opacity: 1;
+    }
+  `
+
+  render() {
+    if (!this.#error.value) {
+      return html``
+    }
+
+    return html`
+      <div class="toast">
+        <span class="message">${this.#error.value}</span>
+        <button 
+          class="close" 
+          @click=${() => store.getState().clearError()}
+          aria-label="Close"
+        >×</button>
+      </div>
+    `
+  }
+}
+
+customElements.define('error-toast', ErrorToast)
diff --git a/components/nav-bar.js b/components/nav-bar.js
index 1b6e241..9b44aa2 100644
--- a/components/nav-bar.js
+++ b/components/nav-bar.js
@@ -1,7 +1,7 @@
 // components/nav-bar.js
 import { LitElement, html, css } from 'lit'
 import { store } from '../store/index.js'
-import { StoreController } from '../controllers/store.js'
+import { StoreController } from "../controllers/store-controller.js";
 
 class NavBar extends LitElement {
   #route = new StoreController(this, store, s => s.route)
diff --git a/components/page-home.js b/components/page-home.js
index 5d71b8a..f6536e7 100644
--- a/components/page-home.js
+++ b/components/page-home.js
@@ -1,7 +1,7 @@
 // components/page-home.js
 import { LitElement, html, css } from 'lit'
 import { store } from '../store/index.js'
-import { StoreController } from '../controllers/store.js'
+import { StoreController } from "../controllers/store-controller.js";
 
 class PageHome extends LitElement {
   #user  = new StoreController(this, store, s => s.user)
diff --git a/components/page-items.js b/components/page-items.js
index efdcf96..dde3a1a 100644
--- a/components/page-items.js
+++ b/components/page-items.js
@@ -1,7 +1,7 @@
 // components/page-items.js
 import { LitElement, html, css } from 'lit'
 import { store } from '../store/index.js'
-import { StoreController } from '../controllers/store.js'
+import { StoreController } from "../controllers/store-controller.js";
 
 class PageItems extends LitElement {
   #items = new StoreController(this, store, s => s.items)
diff --git a/controllers/store.js b/controllers/store-controller.js
similarity index 100%
rename from controllers/store.js
rename to controllers/store-controller.js
diff --git a/store/index.js b/store/index.js
index 3328f31..feaea96 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,13 +1,86 @@
 import { createStore } from 'zustand/vanilla'
+import { persist, createJSONStorage } from 'zustand/middleware'
+import { get, set, del } from 'idb-keyval'
 
-export const store = createStore((set, get) => ({
-  user: null,
-  items: [],
-  route: 'home',
-  
-  // Actions
-  setUser: (user) => set({ user }),
-  addItem: (item) => set(s => ({ items: [...s.items, item] })),
-  removeItem: (id) => set(s => ({ items: s.items.filter(i => i.id !== id) })),
-  navigate: (route) => set({ route }),
+// Create IndexedDB storage adapter with error handling
+const storage = createJSONStorage(() => ({
+  getItem: async (name) => {
+    try {
+      const value = await get(name)
+      return value ?? null
+    } catch (error) {
+      console.error('IndexedDB getItem error:', error)
+      return null // Fallback to null if IndexedDB fails
+    }
+  },
+  setItem: async (name, value) => {
+    try {
+      await set(name, value)
+    } catch (error) {
+      console.error('IndexedDB setItem error:', error)
+      // Silently fail - app continues to work without persistence
+    }
+  },
+  removeItem: async (name) => {
+    try {
+      await del(name)
+    } catch (error) {
+      console.error('IndexedDB removeItem error:', error)
+      // Silently fail
+    }
+  },
 }))
+
+export const store = createStore(
+  persist(
+    (set, get) => ({
+      _hydrated: true,  // Start as true - persistence happens in background
+      user: null,
+      items: [],
+      route: 'home',
+      error: null,  // For error notifications
+      
+      // Actions
+      setUser: (user) => set({ user }),
+      
+      addItem: (item) => {
+        try {
+          if (!item || !item.name || !item.name.trim()) {
+            throw new Error('Item name is required')
+          }
+          set(s => ({ items: [...s.items, item], error: null }))
+        } catch (error) {
+          console.error('addItem error:', error)
+          set({ error: error.message })
+          setTimeout(() => set({ error: null }), 3000) // Clear after 3s
+        }
+      },
+      
+      removeItem: (id) => {
+        try {
+          if (!id) {
+            throw new Error('Item ID is required')
+          }
+          set(s => ({ items: s.items.filter(i => i.id !== id), error: null }))
+        } catch (error) {
+          console.error('removeItem error:', error)
+          set({ error: error.message })
+          setTimeout(() => set({ error: null }), 3000)
+        }
+      },
+      
+      navigate: (route) => set({ route }),
+      
+      clearError: () => set({ error: null }),
+    }),
+    {
+      name: 'app-store',
+      storage,
+      partialize: (state) => ({
+        user: state.user,
+        items: state.items,
+        route: state.route,
+      }),
+    }
+  )
+)
diff --git a/store/middleware/persistence.js b/store/persistence.js
similarity index 90%
rename from store/middleware/persistence.js
rename to store/persistence.js
index 75552f1..bdb7dc1 100644
--- a/store/middleware/persistence.js
+++ b/store/persistence.js
@@ -1,5 +1,5 @@
 // store/middleware/persistence.js
-import { db } from '../idb.js'
+import { db } from './idb.js'
 
 export const makeIdbStorage = (storeName) =>
   createJSONStorage(() => ({
diff --git a/tasks.md b/tasks.md
deleted file mode 100644
index edd6904..0000000
--- a/tasks.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Tasks & Issues
-
-## 1. Critical Issues
-
-- [ ] **1.1 Fix missing `del` import in store/index.js**
-  - Line 3 imports `get, set` from idb-keyval but `del` is used on line 13
-  - Add `del` to the import statement
-  - This will cause a ReferenceError when removeItem is called
-
-- [ ] **1.2 Fix hydration flag initialization**
-  - The `onRehydrateStorage` callback uses `store.setState()` before `store` is fully initialized
-  - Creates a circular reference issue preventing app from loading
-  - **Options:**
-    - A) Initialize `_hydrated: true` by default (simplest)
-    - B) Use Zustand's persist middleware built-in hydration detection
-    - C) Move hydration callback outside store creation
-
-- [ ] **1.3 Consolidate duplicate storage implementation**
-  - Storage is defined in both `store/index.js` AND `store/middleware/persistence.js`
-  - The middleware file exports `idbStorage` but it's not being used
-  - **Decision needed:** Use one or the other, not both
-
-## 2. Architectural Improvements
-
-- [ ] **2.1 Add error handling**
-  - Add try/catch blocks around IndexedDB operations
-  - Implement fallback if IndexedDB fails or is unavailable
-  - Add user feedback for errors (toast notifications?)
-
-- [ ] **2.2 Add partialize option to persist middleware**
-  - Currently saves ALL state including `_hydrated` flag and `route`
-  - Should use `partialize: (state) => ({ user: state.user, items: state.items })`
-  - Prevents unnecessary data in IndexedDB
-
-- [ ] **2.3 Add basic CSS reset to index.html**
-  - No base styles, margins, or font settings currently
-  - Consider adding minimal reset or normalize.css
-
-- [ ] **2.4 Add loading states for async operations**
-  - No loading indicators for add/remove item operations
-  - Consider adding optimistic updates
-
-## 3. Nice to Have
-
-- [ ] **3.1 Add TypeScript types** (optional)
-  - JSDoc comments for better IDE support
-  - Or migrate to .ts files with no-build setup
-
-- [ ] **3.2 Add cross-tab synchronization**
-  - README mentions optional `sync.js` middleware
-  - Implement BroadcastChannel for cross-tab state sync
-
-- [ ] **3.3 Add route history management**
-  - Integrate with browser history API
-  - Support back/forward navigation
-
-- [ ] **3.4 Add unit tests**
-  - Test store actions and selectors
-  - Test component rendering
-  - Test persistence layer