Mess with TODO section