I would also like to make Issues for these TODOs. :)