Remove TODO flags.
Solution to the overlapping rectangles problem.