diff --git a/appview/db/pubkeys.go b/appview/db/pubkeys.go
index 03146fbb..3afecb86 100644
--- a/appview/db/pubkeys.go
+++ b/appview/db/pubkeys.go
@@ -23,8 +23,8 @@ func DeletePublicKey(e Execer, did, name, key string) error {
 
 func DeletePublicKeyByRkey(e Execer, did, rkey string) error {
 	_, err := e.Exec(`
-		delete or ignore from public_keys 
-		where did = ? and name = ? and rkey = ?`,
+		delete from public_keys 
+		where did = ? and rkey = ?`,
 		did, rkey)
 	return err
 }
diff --git a/appview/ingester.go b/appview/ingester.go
new file mode 100644
index 00000000..75b71214
--- /dev/null
+++ b/appview/ingester.go
@@ -0,0 +1,133 @@
+package appview
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"log"
+
+	"github.com/bluesky-social/indigo/atproto/syntax"
+	"github.com/bluesky-social/jetstream/pkg/models"
+	tangled "tangled.sh/tangled.sh/core/api/tangled"
+	"tangled.sh/tangled.sh/core/appview/db"
+)
+
+type Ingester func(ctx context.Context, e *models.Event) error
+
+func Ingest(d db.DbWrapper) Ingester {
+	return func(ctx context.Context, e *models.Event) error {
+		var err error
+		defer func() {
+			eventTime := e.TimeUS
+			lastTimeUs := eventTime + 1
+			if err := d.SaveLastTimeUs(lastTimeUs); err != nil {
+				err = fmt.Errorf("(deferred) failed to save last time us: %w", err)
+			}
+		}()
+
+		if e.Kind != models.EventKindCommit {
+			return nil
+		}
+
+		switch e.Commit.Collection {
+		case tangled.GraphFollowNSID:
+			ingestFollow(&d, e)
+		case tangled.FeedStarNSID:
+			ingestStar(&d, e)
+		case tangled.PublicKeyNSID:
+			ingestPublicKey(&d, e)
+		}
+
+		return err
+	}
+}
+
+func ingestStar(d *db.DbWrapper, e *models.Event) error {
+	var err error
+	did := e.Did
+
+	switch e.Commit.Operation {
+	case models.CommitOperationCreate, models.CommitOperationUpdate:
+		var subjectUri syntax.ATURI
+
+		raw := json.RawMessage(e.Commit.Record)
+		record := tangled.FeedStar{}
+		err := json.Unmarshal(raw, &record)
+		if err != nil {
+			log.Println("invalid record")
+			return err
+		}
+
+		subjectUri, err = syntax.ParseATURI(record.Subject)
+		if err != nil {
+			log.Println("invalid record")
+			return err
+		}
+		err = db.AddStar(d, did, subjectUri, e.Commit.RKey)
+	case models.CommitOperationDelete:
+		err = db.DeleteStarByRkey(d, did, e.Commit.RKey)
+	}
+
+	if err != nil {
+		return fmt.Errorf("failed to %s star record: %w", e.Commit.Operation, err)
+	}
+
+	return nil
+}
+
+func ingestFollow(d *db.DbWrapper, e *models.Event) error {
+	var err error
+	did := e.Did
+
+	switch e.Commit.Operation {
+	case models.CommitOperationCreate, models.CommitOperationUpdate:
+		raw := json.RawMessage(e.Commit.Record)
+		record := tangled.GraphFollow{}
+		err = json.Unmarshal(raw, &record)
+		if err != nil {
+			log.Println("invalid record")
+			return err
+		}
+
+		subjectDid := record.Subject
+		err = db.AddFollow(d, did, subjectDid, e.Commit.RKey)
+	case models.CommitOperationDelete:
+		err = db.DeleteFollowByRkey(d, did, e.Commit.RKey)
+	}
+
+	if err != nil {
+		return fmt.Errorf("failed to %s follow record: %w", e.Commit.Operation, err)
+	}
+
+	return nil
+}
+
+func ingestPublicKey(d *db.DbWrapper, e *models.Event) error {
+	did := e.Did
+	var err error
+
+	switch e.Commit.Operation {
+	case models.CommitOperationCreate, models.CommitOperationUpdate:
+		log.Println("processing add of pubkey")
+		raw := json.RawMessage(e.Commit.Record)
+		record := tangled.PublicKey{}
+		err = json.Unmarshal(raw, &record)
+		if err != nil {
+			log.Printf("invalid record: %s", err)
+			return err
+		}
+
+		name := record.Name
+		key := record.Key
+		err = db.AddPublicKey(d, did, name, key, e.Commit.RKey)
+	case models.CommitOperationDelete:
+		log.Println("processing delete of pubkey")
+		err = db.DeletePublicKeyByRkey(d, did, e.Commit.RKey)
+	}
+
+	if err != nil {
+		return fmt.Errorf("failed to %s pubkey record: %w", e.Commit.Operation, err)
+	}
+
+	return nil
+}
diff --git a/appview/state/jetstream.go b/appview/state/jetstream.go
deleted file mode 100644
index cae822f0..00000000
--- a/appview/state/jetstream.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package state
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"log"
-
-	"github.com/bluesky-social/indigo/atproto/syntax"
-	"github.com/bluesky-social/jetstream/pkg/models"
-	tangled "tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/db"
-)
-
-type Ingester func(ctx context.Context, e *models.Event) error
-
-func jetstreamIngester(d db.DbWrapper) Ingester {
-	return func(ctx context.Context, e *models.Event) error {
-		var err error
-		defer func() {
-			eventTime := e.TimeUS
-			lastTimeUs := eventTime + 1
-			if err := d.SaveLastTimeUs(lastTimeUs); err != nil {
-				err = fmt.Errorf("(deferred) failed to save last time us: %w", err)
-			}
-		}()
-
-		if e.Kind != models.EventKindCommit {
-			return nil
-		}
-
-		did := e.Did
-		raw := json.RawMessage(e.Commit.Record)
-
-		switch e.Commit.Collection {
-		case tangled.GraphFollowNSID:
-			record := tangled.GraphFollow{}
-			err := json.Unmarshal(raw, &record)
-			if err != nil {
-				log.Println("invalid record")
-				return err
-			}
-			err = db.AddFollow(d, did, record.Subject, e.Commit.RKey)
-			if err != nil {
-				return fmt.Errorf("failed to add follow to db: %w", err)
-			}
-		case tangled.FeedStarNSID:
-			record := tangled.FeedStar{}
-			err := json.Unmarshal(raw, &record)
-			if err != nil {
-				log.Println("invalid record")
-				return err
-			}
-
-			subjectUri, err := syntax.ParseATURI(record.Subject)
-
-			if err != nil {
-				log.Println("invalid record")
-				return err
-			}
-
-			err = db.AddStar(d, did, subjectUri, e.Commit.RKey)
-			if err != nil {
-				return fmt.Errorf("failed to add follow to db: %w", err)
-			}
-		}
-
-		return err
-	}
-}
diff --git a/appview/state/state.go b/appview/state/state.go
index 2c7f64be..89ba0804 100644
--- a/appview/state/state.go
+++ b/appview/state/state.go
@@ -63,7 +63,7 @@ func Make(config *appview.Config) (*State, error) {
 	jc, err := jetstream.NewJetstreamClient(
 		config.JetstreamEndpoint,
 		"appview",
-		[]string{tangled.GraphFollowNSID, tangled.FeedStarNSID},
+		[]string{tangled.GraphFollowNSID, tangled.FeedStarNSID, tangled.PublicKeyNSID},
 		nil,
 		slog.Default(),
 		wrapper,
@@ -72,7 +72,7 @@ func Make(config *appview.Config) (*State, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to create jetstream client: %w", err)
 	}
-	err = jc.StartJetstream(context.Background(), jetstreamIngester(wrapper))
+	err = jc.StartJetstream(context.Background(), appview.Ingest(wrapper))
 	if err != nil {
 		return nil, fmt.Errorf("failed to start jetstream watcher: %w", err)
 	}
diff --git a/flake.nix b/flake.nix
index c51e696b..b8dfd0eb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -173,6 +173,7 @@
           TANGLED_DEV=true ${pkgs.air}/bin/air -c /dev/null \
           -build.cmd "${pkgs.tailwindcss}/bin/tailwindcss -i input.css -o ./appview/pages/static/tw.css && ${pkgs.go}/bin/go build -o ./out/${name}.out ./cmd/${name}/main.go" \
           -build.bin "./out/${name}.out" \
+          -build.stop_on_error "true" \
           -build.include_ext "go"
         '';
       tailwind-watcher =