Few TODOs more