Add some glaring TODOs