diff --git a/TODO b/TODO
index 52a7d55..55abd16 100644
--- a/TODO
+++ b/TODO
@@ -1,64 +1,56 @@
 - Sending multiple keys/files
 - ir encode/send needs to read xml file
 - send from keymap
+- Need ir-ctl and ir-keytable command line parsing
+- localization of cli messages
+- clap 4.5/4.4 and merge cir devices/config
+- struct definitions should be on the module rather than repeated
+- honour max_gap in Action::Gap { .. }
+- implement Action::Gap/Flash { Expression::Length {} }
+- test all the protocols
+- Generic decoder Options {} struct
+- calculate maximum length for timeout
+- calculate minimum $extent for avoiding runtime calcs
+- lead in gap (or whatever irptransmogrifier calls it
 - Formatting of ir receive is poor/broken
-- wasmtime bpf backend
-- Generate bpf decoder
 - Test all keymaps
 - Need ir-ctl and ir-keytable command line parsing
 - localization of cli messages
 - scancode <=> irp mapping
 - lircd.conf generate -> send to lircd -> correct result?
+- bpf feature should not be the default
+
+ir-keytable -c
+
+cir config clear
+
+ir-keytable --a [/etc/maps]
+
+cir config auto ?
 
+ir-keytable -w keypmap
 
-  linux scancode  -> irp
+cir config keymap keypmap
 
-  rc-5
-  rc-5x-20
-  rc-5x-sz  -> StreamZap?
-  jvc -> JVC
-  scancode = (D << 8) | F
+cir config lircd foo.lircd
 
-  sony-12 -> Sony12
-  scancode = (D << 8) | F
+cir config show/cir devices?
 
-  sony-15 -> Sony15
-  scancode = (D << 8) | F
+.. what about -p rc5 -
 
-  sony-20 -> Sony20
-  scancode = (D << 16) | (S << 8) | F
+cir config set -p rc5 -s 1:KEY_F1
 
-  nec
-  nec-x
-  nec-32
-  sanyo  ??
-  mcir2-kbd -> MCIR-2-kbd
-  mcir2-mse -> MCIR-2-mouse
+IRPs for kernel protocols include pulse_distance and so on
 
-  rc6-0 -> RC6
-  rc6-6a-20
-  rc6-6a-24
-  rc6-6a-32
-  rc6-mce
+cir decode irp should read IrpProtocols.xml
 
-  sharp -> Sharp
-  xmp
-  cec
-  imon
-  rc-mm-12
-  rc-mm-24
-  rc-mm-32
-  xbox-dvd
+cir transmit keymap
 
 
-irp parameter keymap
+cir devices
+cir config show
+cir config clear
 
-	[[protocols]]
-	name = "streamzap"
-	protocol = "StreamZap"
-	[[protocols.parameter]]
-	keycode = 'KEY_1'
-	parameter = [ "D=2", "F=5" ]
 
 irp language oddities
 
@@ -78,6 +70,5 @@ ENCODING ISSUES:
  - toggle_bit_mask not used when popcount > 1
 
 DECODING ISSUES:
- - raw not supported
  - toggle_bit_mask with more than 1 bit not supported
  - pcmak leading gap not decoded