Add some TODO tasks and comments