Todo list; consider this a spike
Dead lines cleanup