Add another todo item
Fix some relic code from when this was part of KGLT