Added some todo's