Some of these todos seem kind of irrelevant