Start organizing TODOs a bit