Refactoring and begin of IntersectionStrategy implementation.