Added overlaps
Removed todo list.