Removing TODO since I don't think I'm going to do it.