#2 Pass 'points' attribute as pair of iterators
A lot of refactoring