Added some more todo's