Trying to remove the need for OverlappingInstances
Not succeeding much...
No more OverlappingInstances!
Merge branch 'removing-overlap'