Adding some thoughts for TODOs before going to bed...