Adding TODOs. Making notes to be sorted with a fresh look at our libraries