1 files changed, 59 insertions, 56 deletions

diff --git a/ds-choice-list.pd b/ds-choice-list.pd
index 4312fce..15de01f 100644
--- a/ds-choice-list.pd
+++ b/ds-choice-list.pd
@@ -1,78 +1,81 @@
-#N struct 1002.list-item.template float x float y symbol item-name
-symbol action-name float item-color float action-color;
-#N canvas 376 92 450 300 10;
-#N canvas 0 22 450 300 \$0.display 1;
-#X scalar 1002.list-item.template 0 80 sandwich symbol 0 0 \;;
-#X scalar 1002.list-item.template 0 40 cheese symbol 0 0 \;;
-#X scalar 1002.list-item.template 0 0 ham symbol 0 0 \;;
-#X restore 219 103 pd \$0.display;
-#N canvas 667 449 450 300 make-list 1;
+#N canvas 927 467 450 300 10;
+#N canvas 0 22 450 300 \$0.display 0;
+#X restore 234 247 pd \$0.display;
+#N canvas 650 261 450 348 make-list 0;
 #X obj 130 112 t b b;
 #X obj 217 156 ds-begin pd-\$0.display;
-#X obj 130 205 append \$0.list-item.template x y;
-#X obj 130 229 t b a;
-#X obj 130 275 set -symbol \$0.list-item.template item-name;
+#X obj 130 269 t b a;
+#X obj 130 315 set -symbol \$0.list-item.template item-name;
 #X obj 130 63 list-drip;
 #X obj 130 140 f;
 #X obj 155 140 + 1;
-#X msg 130 180 0 \$1;
+#X msg 130 200 0 \$1;
 #X msg 175 112 0;
-#X obj 130 160 * 40;
+#X obj 130 180 * 40;
 #X obj 130 90 t b a;
 #X obj 388 156 t a;
-#X obj 130 252 symbol;
+#X obj 130 292 symbol;
 #X obj 130 41 t a b b;
 #X msg 192 41 clear;
 #X obj 235 41 s pd-\$0.display;
 #X obj 130 15 inlet;
-#X connect 0 0 6 0;
+#X obj 130 245 append \$0.list-item.template x y index;
+#X obj 130 220 list append;
+#X obj 130 160 t a a;
+#X connect 0 0 5 0;
 #X connect 0 1 1 0;
-#X connect 1 0 2 2;
-#X connect 2 0 3 0;
-#X connect 3 0 13 0;
-#X connect 3 1 4 1;
-#X connect 5 0 11 0;
-#X connect 6 0 10 0;
-#X connect 6 0 7 0;
-#X connect 7 0 6 1;
-#X connect 8 0 2 0;
-#X connect 9 0 6 1;
-#X connect 10 0 8 0;
-#X connect 11 0 0 0;
-#X connect 11 1 12 0;
-#X connect 12 0 13 1;
+#X connect 1 0 17 3;
+#X connect 2 0 12 0;
+#X connect 2 1 3 1;
+#X connect 4 0 10 0;
+#X connect 5 0 6 0;
+#X connect 5 0 19 0;
+#X connect 6 0 5 1;
+#X connect 7 0 18 0;
+#X connect 8 0 5 1;
+#X connect 9 0 7 0;
+#X connect 10 0 0 0;
+#X connect 10 1 11 0;
+#X connect 11 0 12 1;
+#X connect 12 0 3 0;
 #X connect 13 0 4 0;
-#X connect 14 0 5 0;
-#X connect 14 1 9 0;
-#X connect 14 2 15 0;
-#X connect 15 0 16 0;
-#X connect 17 0 14 0;
-#X restore 34 105 pd make-list;
-#N canvas 884 22 450 300 \$0.list-item.template 1;
-#X obj 52 38 struct \$0.list-item.template float x float y symbol item-name
-symbol action-name float item-color float action-color;
-#X obj 44 169 filledpolygon 900 90 2 10 0 20 10 30 0 40 10 30 20 40
-30 30 40 20 30 10 40 0 30 10 20 0 10;
+#X connect 13 1 8 0;
+#X connect 13 2 14 0;
+#X connect 14 0 15 0;
+#X connect 16 0 13 0;
+#X connect 17 0 2 0;
+#X connect 18 0 17 0;
+#X connect 19 0 9 0;
+#X connect 19 1 18 1;
+#X restore 34 175 pd make-list;
+#N canvas 884 22 450 300 \$0.list-item.template 0;
 #X obj 44 200 drawsymbol item-name 43 13;
 #X obj 52 86 route click;
 #X obj 52 114 s \$0.activate-item;
-#X connect 0 0 3 0;
-#X connect 3 0 4 0;
-#X restore 219 81 pd \$0.list-item.template;
+#X obj 44 169 filledpolygon 900 510 2 10 0 20 10 30 0 40 10 30 20 40
+30 30 40 20 30 10 40 0 30 10 20 0 10;
+#X obj 52 38 struct \$0.list-item.template float x float y symbol item-name
+symbol action-name float item-color float action-color float index
+;
+#X connect 1 0 2 0;
+#X connect 4 0 1 0;
+#X restore 234 225 pd \$0.list-item.template;
 #N canvas 121 475 450 300 activate-item 0;
 #X obj 67 75 r \$0.activate-item;
-#X obj 68 131 get \$0.list-item.template item-name action-name;
-#X obj 68 160 outlet;
-#X obj 394 162 outlet;
+#X obj 68 131 get \$0.list-item.template index item-name action-name
+;
+#X obj 68 163 pack f s s;
+#X obj 67 198 outlet;
 #X connect 0 0 1 0;
 #X connect 1 0 2 0;
-#X connect 1 1 3 0;
-#X restore 34 128 pd activate-item;
+#X connect 1 1 2 1;
+#X connect 1 2 2 2;
+#X connect 2 0 3 0;
+#X restore 34 208 pd activate-item;
 #X obj 34 48 inlet;
-#X obj 34 77 route list;
-#X obj 34 166 outlet;
-#X obj 143 166 outlet;
-#X connect 3 0 6 0;
-#X connect 3 1 7 0;
-#X connect 4 0 5 0;
-#X connect 5 0 1 0;
+#X obj 34 236 outlet;
+#X obj 323 52 inlet;
+#X obj 323 117 s pd-\$0.display;
+#X connect 3 0 5 0;
+#X connect 4 0 1 0;
+#X connect 6 0 7 0;