Add some TODO to not forget