Added some todo's.