Add some TODO notes