Added todo:s in all items that need attention.