cluster: Add some TODOs