Added some more todos