diff --git a/mist/octagon.s b/mist/octagon.s
index d437bc7d..5f40de2e 100644
--- a/mist/octagon.s
+++ b/mist/octagon.s
@@ -22,6 +22,7 @@ octagon_start:
 	lda	#0
 	sta	DRAW_PAGE
 	sta	LEVEL_OVER
+	sta	ANIMATE_FRAME
 
 	; init cursor
 
@@ -59,6 +60,25 @@ game_loop:
 	; handle special-case forground logic
 	;====================================
 
+	lda	ANIMATE_FRAME
+	beq	nothing_special
+
+	lda	LOCATION
+	cmp	#OCTAGON_FRAME_SHELF
+	beq	animate_frame_shelf
+	cmp	#OCTAGON_FRAME_DOOR
+	beq	animate_frame_door
+
+	bne	nothing_special
+
+animate_frame_shelf:
+	jsr	shelf_swirl
+	jmp	nothing_special
+
+animate_frame_door:
+	jsr	door_swirl
+	jmp	nothing_special
+
 nothing_special:
 
 	;====================================
diff --git a/mist/octagon_bookshelf.s b/mist/octagon_bookshelf.s
index aa80f1f0..812463e7 100644
--- a/mist/octagon_bookshelf.s
+++ b/mist/octagon_bookshelf.s
@@ -46,6 +46,19 @@ elevator_goto_library_level:
 
 open_bookshelf:
 
+	; if already open, make noise
+
+	ldy	#LOCATION_NORTH_EXIT
+	lda	location8,Y
+	cmp	#OCTAGON_BOOKSHELF_CLOSE
+	beq	actually_open
+
+	jsr	cant_noise
+
+	rts
+
+actually_open:
+
 	; change background of center room N
 
 	ldy	#LOCATION_NORTH_BG
@@ -96,12 +109,28 @@ open_bookshelf:
 
 	; start animation
 
+	lda	#1
+	sta	ANIMATE_FRAME
+
 	rts
 
 
 
 close_bookshelf:
 
+	; if already closed, make noise
+
+	ldy	#LOCATION_NORTH_EXIT
+	lda	location8,Y
+	cmp	#OCTAGON_BOOKSHELF_CLOSE
+	bne	actually_close
+
+	jsr	cant_noise
+
+	rts
+
+actually_close:
+
 	; change background of center room N
 
 	ldy	#LOCATION_NORTH_BG
@@ -152,6 +181,9 @@ close_bookshelf:
 
 	; start animation
 
+	lda	#1
+	sta	ANIMATE_FRAME
+
 	rts
 
 
@@ -163,3 +195,165 @@ close_bookshelf:
 ; OCTOBER 11, 1984 10:04 AM
 ; JANUARY 17, 1207 5:46 AM
 ; NOVEMBER 23, 9791 6:57 PM
+
+
+	;=============================
+	; swirl the picture frame
+	;=============================
+shelf_swirl:
+
+	lda	ANIMATE_FRAME
+	asl
+	tay
+
+	lda	shelf_swirl_sprites,Y
+	sta	INL
+	lda	shelf_swirl_sprites+1,Y
+	sta	INH
+
+	lda	#17
+
+advance_swirl:
+	sta	XPOS
+	lda	#12
+	sta	YPOS
+
+	jsr	put_sprite_crop
+
+
+	lda	FRAMEL
+	and	#$f
+
+	bne	shelf_swirl_no_inc
+
+	inc	ANIMATE_FRAME
+
+	lda	ANIMATE_FRAME
+	cmp	#6
+	bne	shelf_swirl_no_inc
+
+	lda	#0
+	sta	ANIMATE_FRAME
+
+shelf_swirl_no_inc:
+
+
+	rts
+
+
+	;=============================
+	; swirl the picture frame
+	;=============================
+door_swirl:
+
+	lda	ANIMATE_FRAME
+	asl
+	tay
+
+	lda	door_swirl_sprites,Y
+	sta	INL
+	lda	door_swirl_sprites+1,Y
+	sta	INH
+
+	lda	#16
+	jmp	advance_swirl
+
+
+cant_noise:
+	ldx	#$50
+cant_noise_loop:
+	bit	$c030
+	nop
+	nop
+	nop
+	dex
+	bne	cant_noise_loop
+	rts
+
+
+; sprites
+
+shelf_swirl_sprites:
+	.word empty_swirl
+	.word shelf_swirl1,shelf_swirl2,shelf_swirl3,shelf_swirl4
+	.word empty_swirl
+
+door_swirl_sprites:
+	.word empty_swirl
+	.word door_swirl1,door_swirl2,door_swirl3,door_swirl4
+	.word empty_swirl
+
+empty_swirl:
+	.byte 1,1
+	.byte	$AA
+
+
+shelf_swirl1:
+	.byte 7,6
+	.byte $0d,$0d,$0d,$0d,$0d,$0d,$0d
+	.byte $00,$00,$00,$d0,$d0,$08,$80
+	.byte $00,$00,$80,$0d,$00,$dd,$88
+	.byte $00,$88,$90,$00,$80,$08,$88
+	.byte $00,$88,$90,$99,$00,$88,$00
+	.byte $00,$98,$91,$90,$99,$98,$00
+
+shelf_swirl2:
+	.byte 7,6
+	.byte $0d,$0d,$0d,$0d,$0d,$0d,$0d
+	.byte $00,$00,$00,$08,$08,$80,$00
+	.byte $90,$09,$08,$08,$90,$00,$88
+	.byte $88,$00,$88,$00,$89,$00,$88
+	.byte $88,$00,$00,$08,$00,$80,$08
+	.byte $00,$99,$90,$90,$90,$90,$00
+
+shelf_swirl3:
+	.byte 7,6
+	.byte $0d,$0d,$0d,$0d,$0d,$0d,$0d
+	.byte $00,$00,$80,$80,$80,$00,$00
+	.byte $80,$08,$80,$80,$80,$08,$89
+	.byte $99,$00,$88,$80,$99,$00,$98
+	.byte $00,$99,$d0,$d0,$09,$00,$99
+	.byte $00,$90,$90,$90,$90,$99,$00
+
+shelf_swirl4:
+	.byte 7,6
+	.byte $0d,$0d,$0d,$0d,$0d,$0d,$0d
+	.byte $00,$00,$50,$00,$00,$00,$00
+	.byte $00,$55,$00,$00,$90,$80,$00
+	.byte $00,$85,$00,$08,$80,$04,$98
+	.byte $00,$00,$08,$08,$00,$90,$09
+	.byte $00,$90,$90,$90,$99,$90,$00
+
+
+door_swirl1:
+	.byte 7,5
+	.byte $0d,$0d,$0d,$0d,$0d,$0d,$0d
+	.byte $00,$00,$00,$07,$77,$70,$00
+	.byte $00,$00,$00,$04,$47,$47,$00
+	.byte $00,$00,$dd,$44,$47,$44,$00
+	.byte $00,$00,$dd,$d4,$d0,$00,$00
+
+door_swirl2:
+	.byte 7,5
+	.byte $0d,$0d,$0d,$7d,$0d,$0d,$0d
+	.byte $00,$00,$d0,$d0,$07,$70,$00
+	.byte $d0,$0d,$70,$70,$44,$77,$00
+	.byte $dd,$00,$77,$04,$04,$77,$00
+	.byte $99,$90,$90,$07,$07,$00,$00
+
+door_swirl3:
+	.byte 7,5
+	.byte $0d,$0d,$0d,$0d,$0d,$0d,$0d
+	.byte $00,$70,$07,$07,$00,$00,$00
+	.byte $00,$77,$00,$44,$7d,$7d,$d0
+	.byte $00,$07,$70,$74,$74,$77,$dd
+	.byte $00,$00,$00,$00,$00,$90,$09
+
+door_swirl4:
+	.byte 7,5
+	.byte $0d,$0d,$0d,$0d,$0d,$0d,$0d
+	.byte $00,$70,$77,$47,$00,$00,$00
+	.byte $00,$47,$77,$44,$00,$00,$00
+	.byte $00,$00,$44,$44,$d4,$00,$00
+	.byte $00,$00,$d0,$dd,$dd,$00,$00
+