Add some todo comments