Add some todo comments on window