Beginnings of overlap handling