It might be good to make sure that there is a test or ticket around for each of these TODO's.