Add some TODO thoughts